Don't look for X_PACKAGES unless building for x11. (#313986, John

2005-11-01  Tor Lillqvist  <tml@novell.com>

	* configure.in: Don't look for X_PACKAGES unless building for
	x11. (#313986, John Ehresman)

diff --git a/ChangeLog b/ChangeLog
index c6c2f5f1256210ccfe637d399e8ac650d60da490..f0a80f2dd810ab23310d3d361976503c4be9b57f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-01  Tor Lillqvist  <tml@novell.com>
+
+       * configure.in: Don't look for X_PACKAGES unless building for
+       x11. (#313986, John Ehresman)
+
 2005-10-28  Erdal Ronahi  <erdal.ronahi@gmail.com>
 
        * configure.in: Added ku (Kurdish) to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c6c2f5f1256210ccfe637d399e8ac650d60da490..f0a80f2dd810ab23310d3d361976503c4be9b57f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-01  Tor Lillqvist  <tml@novell.com>
+
+       * configure.in: Don't look for X_PACKAGES unless building for
+       x11. (#313986, John Ehresman)
+
 2005-10-28  Erdal Ronahi  <erdal.ronahi@gmail.com>
 
        * configure.in: Added ku (Kurdish) to ALL_LINGUAS

diff --git a/configure.in b/configure.in
index dc2f5636c31a2822006f3cfd8d52a5a7d6b5dd4e..193879a1cd5be62d0a6b91e6c3e74d8ac2f8cc29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1388,9 +1388,12 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES"
+GDK_PACKAGES="$PANGO_PACKAGES"
+if test "x$gdktarget" = "xx11"; then
+  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
+fi
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $X_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need